From 07f038236891ead71a65146d0aec9224f0cac903 Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Sat, 12 Dec 1998 22:49:38 +0000 Subject: [PATCH] Mark child->window as destroyed so we don't destroy it again. Sat Dec 12 17:46:55 1998 Owen Taylor * gtk/gtklayout.c (gtk_layout_unrealize): Mark child->window as destroyed so we don't destroy it again. --- ChangeLog | 6 ++++++ ChangeLog.pre-2-0 | 6 ++++++ ChangeLog.pre-2-10 | 6 ++++++ ChangeLog.pre-2-2 | 6 ++++++ ChangeLog.pre-2-4 | 6 ++++++ ChangeLog.pre-2-6 | 6 ++++++ ChangeLog.pre-2-8 | 6 ++++++ gtk/gtkclist.c | 2 +- gtk/gtklayout.c | 1 + 9 files changed, 44 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 3a718d560f..0a5638aaa9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Sat Dec 12 17:46:55 1998 Owen Taylor + + * gtk/gtklayout.c (gtk_layout_unrealize): Mark + child->window as destroyed so we don't destroy + it again. + Sat Dec 12 17:18:32 1998 Owen Taylor * gdk/gdkfont.c (gdk_text_extents): Corrections diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 3a718d560f..0a5638aaa9 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,9 @@ +Sat Dec 12 17:46:55 1998 Owen Taylor + + * gtk/gtklayout.c (gtk_layout_unrealize): Mark + child->window as destroyed so we don't destroy + it again. + Sat Dec 12 17:18:32 1998 Owen Taylor * gdk/gdkfont.c (gdk_text_extents): Corrections diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 3a718d560f..0a5638aaa9 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +Sat Dec 12 17:46:55 1998 Owen Taylor + + * gtk/gtklayout.c (gtk_layout_unrealize): Mark + child->window as destroyed so we don't destroy + it again. + Sat Dec 12 17:18:32 1998 Owen Taylor * gdk/gdkfont.c (gdk_text_extents): Corrections diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 3a718d560f..0a5638aaa9 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,9 @@ +Sat Dec 12 17:46:55 1998 Owen Taylor + + * gtk/gtklayout.c (gtk_layout_unrealize): Mark + child->window as destroyed so we don't destroy + it again. + Sat Dec 12 17:18:32 1998 Owen Taylor * gdk/gdkfont.c (gdk_text_extents): Corrections diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 3a718d560f..0a5638aaa9 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,9 @@ +Sat Dec 12 17:46:55 1998 Owen Taylor + + * gtk/gtklayout.c (gtk_layout_unrealize): Mark + child->window as destroyed so we don't destroy + it again. + Sat Dec 12 17:18:32 1998 Owen Taylor * gdk/gdkfont.c (gdk_text_extents): Corrections diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 3a718d560f..0a5638aaa9 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,9 @@ +Sat Dec 12 17:46:55 1998 Owen Taylor + + * gtk/gtklayout.c (gtk_layout_unrealize): Mark + child->window as destroyed so we don't destroy + it again. + Sat Dec 12 17:18:32 1998 Owen Taylor * gdk/gdkfont.c (gdk_text_extents): Corrections diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 3a718d560f..0a5638aaa9 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ +Sat Dec 12 17:46:55 1998 Owen Taylor + + * gtk/gtklayout.c (gtk_layout_unrealize): Mark + child->window as destroyed so we don't destroy + it again. + Sat Dec 12 17:18:32 1998 Owen Taylor * gdk/gdkfont.c (gdk_text_extents): Corrections diff --git a/gtk/gtkclist.c b/gtk/gtkclist.c index 5d54fd078e..6b5c1e075e 100644 --- a/gtk/gtkclist.c +++ b/gtk/gtkclist.c @@ -5804,7 +5804,7 @@ draw_rows (GtkCList *clist, } /* this is a small special case which exposes the bottom cell line - * on the last row -- it might go away if I change the wall the cell + * on the last row -- it might go away if I change the way the cell * spacings are drawn */ if (clist->rows == first_row) diff --git a/gtk/gtklayout.c b/gtk/gtklayout.c index c19adfdef1..ac961d87c9 100644 --- a/gtk/gtklayout.c +++ b/gtk/gtklayout.c @@ -503,6 +503,7 @@ gtk_layout_unrealize (GtkWidget *widget) { gdk_window_set_user_data (child->window, NULL); gdk_window_destroy (child->window); + child->window = NULL; } tmp_list = tmp_list->next; -- 2.30.2